Repository navigation
Conversation
|
🚀 New build available for commit |
atsju
left a comment
atsju
left a comment
There was a problem hiding this comment.
Version 2.1 is duplicated at bottom of document. Please fix it too.
Line 223 there is a trailing \ that has nothing to do there
Co-authored-by: Julien Staub <atsju2@yahoo.fr>
Co-authored-by: Julien Staub <atsju2@yahoo.fr>
Co-authored-by: Julien Staub <atsju2@yahoo.fr>
Optimistically added live video mode feature removed a backslash section 2.1 was duplicated
|
I fixed the backslash and the duplicate section 2.1. I also optimistically added the live video feature. 😄 I can always remove that if it doesn't get merged in. |
|
🚀 New build available for commit |
|
🚀 New build available for commit |
|
🚀 New build available for commit |
|
🚀 New build available for commit |
|
I approve this. I would let it open until you are really ready to do the release. |
|
@Lucassifoni I believe there is a real causes for the build failure on Mac. |
|
Yeah, probably a real error. Strange that it didn't do it one time. Can you look into it? I don't understand the build stuff. |
On it ! |
|
Okay, the versions of libraries pulled by homebrew in the arm64 and intel github actions runners differ, but that shouldn't be blocking. The checks in the workflow are too strict. The actual build are fine but their combination logic in an universal DMG is too strict right now. Opening a PR. |
|
Hello, |
|
As far as I know you are not blocking anything. yet. I wanted to get Dale's latest "live video" feature into 8.5. It is basically ready but Dale keeps tweaking it. Which is great. It's on branch blinkrate. Dale is doing 99% of the developing and we are emailing each other multiple times per day. I've been doing a lot of testing of his features. We did get an error in the "universal-dmg" part of the build. And blinkrate has latest master merged into it. So that's not good. I haven't looked at that at all as I don't know much about yaml or mac. |
|
Oh, I see it. I’ll be on it tonight. If it continues happening in future releases I’d advise staying on two separate architectures for Mac until I get more experience with the lipo’d build to avoid blocking future releases. But I’ll work on it first. |
|
thanks. I don't think we'll need that fixed for at least a few days. Even if Dale declares he is done today, I promised I would add a camera exposure feature. Plus I need to change something that Julien did recently. I keep thinking we are less than a week away and then Dale comes out with some completely new feature related to video capture. |
|
Actually the blinkrate branch is 18 commits behind master, including the #384 fixes. I think getting it in sync with master will fix the universal DMG diffing step. |
|
oh! User error! I did this command (never tried it before): And it gave me the correct merge base of the two and when I searched for that commit it was shown as the latest branch but I guess I must have searched only on blinkrate branch or maybe I didn't do a git fetch. Not sure. Either way I screwed up. I can see now that we need to merge master into blinkrate again. Sorry to cause you unnecessary work. |
|
I get a bit lost here. I merged with master a week or so ago. So how can we be behind even if George did something wrong. Does that mean that blinkrate somehow reverted to before my merge and now I when I merged George's code it is behind. OR can I just push my current changes and be back up to current. |
|
git keeps records of everything. You did the merge on 8/25. It might seems like just a week or two ago but it was a little over a month ago. There were some changes to master between 8/25 and 9/3 and nothing since then. So nothing in a month but a few changes after 8/25. It would be good to merge master into blinkrate soon. I just did a quick test merge (just a practice to see what would happen if I merged). Google to learn how to do this yourself if you want. Anyway there are conflicts in only 2 files: wavefront.h and wavefront.cpp. Some changes related to the whole discussion of deep copy versus shallow copy and copy constructors and such as it relates to class wavefront. That's in wavefront.cpp And something else that affects 2 lines of code in wavefront.h. I think maybe something got moved around in the .h file possibly and merge got confused. I'd have to look at the entire .h file, not just the affected spot. |
|
Merged resolved and pushed
… On 10/03/2026 7:37 PM CDT gr5 ***@***.***> wrote:
gr5 left a comment (githubdoe/DFTFringe#383) #383 (comment)
git keeps records of everything. You did the merge on 8/25. It might seems like just a week or two ago but it was a little over a month ago.
There were some changes to master between 8/25 and 9/3 and nothing since then. So nothing in a month but a few changes after 8/25.
It would be good to merge master into blinkrate soon.
I just did a quick test merge (just a practice to see what would happen if I merged). Google to learn how to do this yourself if you want. Anyway there are conflicts in only 2 files: wavefront.h and wavefront.cpp. Some changes related to the whole discussion of deep copy versus shallow copy and copy constructors and such as it relates to class wavefront. That's in wavefront.cpp
And something else that affects 2 lines of code in wavefront.h. I think maybe something got moved around in the .h file possibly and merge got confused. I'd have to look at the entire .h file, not just the affected spot.
—
Reply to this email directly, view it on GitHub #383?email_source=notifications&email_token=AA2BJLDXYNDSZ7BCAKJHS4T5SGLTHA5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKOJXGUYDINRVG4Y2M4TFMFZW63VHMNXW23LFNZ2KKZLWMVXHJLDGN5XXIZLSL5RWY2LDNM#issuecomment-5975046571, or unsubscribe https://github.com/notifications/unsubscribe-auth/AA2BJLAOOI65OFHHGHGH32D5SGLTHAVCNFSNUABEKJSXA33TNF2G64TZHM2TOOJTGY4TQNR3JFZXG5LFHM2TENRQHA3DCNBSGCQXMAQ.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS https://github.com/notifications/mobile/ios/AA2BJLARVX4WTIJIQTCQ3TL5SGLTHA5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKOJXGUYDINRVG4Y2M4TFMFZW63VHMNXW23LFNZ2KKZLWMVXHJKTGN5XXIZLSL5UW64Y and Android https://github.com/notifications/mobile/android/AA2BJLHTXKJPJGLFG2Q3PMT5SGLTHA5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKOJXGUYDINRVG4Y2M4TFMFZW63VHMNXW23LFNZ2KKZLWMVXHJLTGN5XXIZLSL5QW4ZDSN5UWI. Download it today!
You are receiving this because you commented.Message ID: ***@***.***>
|
4 participants
This may be a bit early but I'm getting ready for the next release. I'm hoping at least one more pr (zernike checkboxes) will be merged first.
#366